small tweaks and fixes