Started Bernhard's corrections.
Updated todos.