More fixes and spelling.