added jumping and collision detection and some minor stuff