few bugfixes