A bunch of updates and fixes.