Exposure update

This PR is in preparation the upcoming presentations. Some of the fixes are intended to be permanent and other are temporary.