Got rid off some simple errors, still more todo.