fix more compile errors, compiles now, did not check if the new additions produce intended behavior
additional