Added/Fixed appropriate indexes and improved reporting.