Collision stuff and more quad tree fixes / optimization