Reformatting and several improvements to reporting