Made a few quick changes to collisions and physics. Almost have the
jumping working properly.