Plumbing vent fix, crash with empty tear off fix, other minor enhancements
Merge branch 'marty'