7/14-updating once again...

undid 8 unsynced changes