bugfixes, suggestions