more "tools" fixes, issue #195