Don't need that in the comment, eh
Fix up some issues that were noticed while annotating