small changes
Merge from github.
Updates to the binding stuff yada yada.