fix errors
test on linux done
bugfixing