Modules registered and started dynamically, minor tweaks