Updated numerous files in order to get report functionality working correctly for most activities