Fix spelling and other small issues