comparison fix
warning removal and SC.org removal