some more small tweaks