added AABB Collision and changed some stuff