Add notes and do some clean up