Various modifications and spelling fixes