2 new modes, bug fixes, and cleanup