fix a number of errors, give a bit more feedback