Changed how 1 year and 2 year bills are calculated. (1 year bills = 1 -> 12; 2 year bills = 1 -> 24;)