some small modifications, began adding walljump