fixed some of the reporting and quit behavior