Address numerous notes-to-self, and clarify those which remain