Fixed tree stuff and added new blocks