fix various issues and add Resources