small tweaks from old master