fixing code and resources