settings, polished, cleaned up, removed unused icons, removed debug code etc