a unit test? and some tweaks