some small tweaks and tests