Some minor corrections. More todo.