annual and alt annual rates now collected in hashes instead of given separately. new rate by year support and replaced (null) with null and in fixtures files.