More report writing, some cleanup of code