Fixed a lot of problems with the climb bug patch