Feature/nova modeler improvements

ok, shortening them up.