Super mode modifications finished; code cleanup