Merging in Tyson's updates
stop checking for Shuffle columns

More useful condition descriptions