fix more assertions and more file endings ...