Fix some bugs, cache a bit more, add 2013 info