Added some new bindings and cleaned up the file.