add typo fixes; shortcut cleanup