fixed: resources + error messages