Lots of spell fixes