bugfixing
bugs fixed