Various changes and spelling mistakes