Just a new TODO note
More comment query cleanup and fix a typo
Spacing, quick and dirty