fixing username filters. sm misc cleanup.