Fixed some stuffs
Improved octree perf