started adding stuff for collision detection, also changed player movement a bit