fixed jumping stuff, fixed horiz-collision, lines