More work on comments, bindings tweaks, etc.