Some more cleanup and new modules.