cleaned up more bindings and sorted the bindings so they were easier to look at