updated tools and minor fixes for the new tools
Merge remote-tracking branch 'origin/master'