some more minor tuning and corrections