Many cleanups completed
For 1.8.5.2 Minor report/error message improvments