main controller specs and some cleanups