fix some small tweaks