Added more bindings and cleaned up