added more resources, fixed some bugs