Fixed some errors
Merge with master
Added timer and updated OctTree