fix some error messages and tweak tasks