Various fixes for phased facades. Fixes #1808

Also includes cleanup of some debug stuff that I left, and a bug fix