fixed some collisions and images