Added better content checking

And export of master CSV