fixes and AABB support