rsrc fix started
merged
rsrc done