(Squash me) Some of ben's edits.