Updates, fixes, etc

Per our emails, these are fixes and changes I think you'll want.

Cheers.