more small tweaks