Edit resources and some corrections