More TODO.
Enable DPB_PROPERTIES.
Add some patches.