fixed more broken stuff.