Add feature #6 and some report improvements