tweaks and tests