New resource, bugfixes