Fixed some more fetches and populated the framework