some small tweaks and fixes