a few more small tweaks