Cleanup, added further data readouts