few changes (bugfixies)