more notes
some cleanup
ack