Tweaks and proofread up to 2.2.2