merged fix to decapitated trees; other bugs now exists