a few tweaks to the framework.