Committing small changes and bug fixes to code... work on collision detection after this