Bugfix
Updated resources managment. TODO: bugfix
Not very important
Updated resources loading