prettify and fixes
tidying and minor fixes
diff bindings and minor fixes