tweak, update, cleanup
remove .DS_Store
merge and standardize