further small tweaks