end report changes and small implementation changes