work on comments and notes