various small tweaks and changes