some more small fixes for resources + starting to change needs to new model