commit bwtdt format before I lose it!
Bare minimum of fixes to bwtdt so it doesn't break too much.
Merge branch 'bleeding-jumbo' into bleeding-mask

* bleeding-jumbo:
  Bare minimum of fixes to bwtdt so it doesn't break too much.
  commit bwtdt format before I lose it!