Start of cleanup plus a couple OS1 fixes