improved reporting and added cross links