some clean up and notes