cleanup + rapport part 4
Merge remote-tracking branch 'origin/ughnewbranch'