Bindings refactoring
more refactoring
minor changes