Bug fix party!

**NOT READY FOR MERGE**

Fixes #1467 #1615 #1656. Addresses part of #1696.

@gregcaporaso and I pair-programmed most of this.