Restore aloha changes and fix spellings