bugfixing various parts
more fixes