A few more minor updates and polish.