minor cleanup and a bug ifx (somehow lost adding the modules to the loaded set...)