Implement double-bill handling properly
Sort out a few consistency issues
Add data for 1999