More verbose error output + comments