cleaned up format and var names as requested by @CovertJaguar at #872
fix smp-crash on pipe with facade removal
fixes #871
Merge remote-tracking branch 'up/master'