Lots of keyword organization

Small, misc typo fixes