first bugfixes :-)