Cleaned up polygons and added collision