Refactored PointCollision and added rectangle and circle checks