Massive bugfix update + Extrabees/trees