further cleanup of API
Fix handtool