Notes back online, undergoing some refactoring.
Minor style changes, method rename.