I think I fixed stuff but I don't remember what changed.  Whoops.