Several changes, including collision detection (still buggy) and score counting)