Added missing words, misc. fixes