various cleanups, comments added to simple controller manager