implement new settings, various cleanup