Fixed collision detection and started implementing scores