fixes and adjustments