AABB stuff and fix collision and entity class partial