New resources, bugfixes