add new templates
add 2 new tools
minor bug fix