some more small tweaks...