fixed collision detection, changed colors, fixed scoring