making output on errors more informative, if less readable for the moment. need to pear down that stack trace
Merge branch 'dev'