bugfixing
minor changes