+notes, minor changes