fixits from system switch errors/ no changes really