make some more notes cleanup progress