Updated report structure a little.