Several changes, most of them related to the new way to load resources with a ResourceManager