bugfixes, adjustments