fixes for revision almost done.
Merge branch 'rev1' into report