minor clean up, more notes