Some changes in reporting

should be nicer now