improved annotation comment and username scrape