fix newlines; add and clarify a couple definitions