Fix spelling again and other issues