updated resources and fixed some bugs. all tests passing