some small tweaks