Commented out Pig support
Minor cleanup
Cleaned up the multiple outputs support