fixed top/bottom collisions for Wall.js, restructured collidesWith as well