bug fixes
rename
clean up and add new resources