Fix bill versions being read.
Lots of small changes.