some tweaks and a test