more fixes and adjustments