commited notes and changes from 4/17