Prep for Release

Cleaned up the level 2 caching and configuraiton, and better testing!