Small fix to report() funtion; code layout fixes.