Commenting some debug code, added entity type counts