updates for mojo api
bugfixes