HpglShot modifications, long survey can now plot shots correctly
Updated Long Survey, fixed merge conflicts, and added summary comments