Carpenter's Patch

Removed Carpenter's Blocks, minor config changes