@anlai ok, should be fixed now.  take a look at the rest and merge when things look good