Fixed a bunch of stuff. See email on Sep 22