some small tweaks and changes