Blerp
Some additions and fixes