bug fixes, but some bindings are not resolved for unknown reasons now