Brought a bunch of stuff up-to-date