Fixed a variety of issues with actually using the framework