Updated tool help, improved error handling