Restarting from Modules page, cleanup and fixes.