Miscellaneous tweaks and tests
Fix spellings