fix more very stupid bugs... someone must have had too much drinks while writing...