Added parsing of text notes in addition to highlights, removed line breaks in highlights, added filenames to descriptions for each annotation, some rearranging