Spelling fixes. Adjust variable table so that the indicator functions are cleaner.