fix 34

- re-enabled move_mgr

- minor fixes