Substantial proofreading.

Can I haz merge? :)