small fixes and adjustments