First Round of changes from Comments on Beta

Vocab, Arch16N and small UI changes