Fixed a few nits and picks.