Round 3

Third and final installment of tweaks and documentation, etc.