bugfixing
bugfixing and comments