partial commit, minor changes after api upd