Improve collision detection; change colors