some stuff got better, some stuff got worse.  i will fix it tomorrow