Fixed bugs, reverted tree-kill attempt