0.3.1.1 Revisions

Cleaning up the patches with new smooth and catch blocks. Generally
fixing issues with my patching skills.