first bugfixes