A bunch of changes and rewrites from yesterday and today.