Updated more of Randall's suggestions.