updated tool-template
cleanup and arrow fix
A little more cleanup