separate collisions, fix last frame of falling, fix jump