settings class, tightening up some loose ends