report and fixes
mergning, again