bugfixes & adjustments