Fixed bindings in blocks and cleaned up Pattern classes.