various small tweaks