minor fixes and adjustments