removed a todo
doc and format fixes