fixing bug in options
fixing defaults; remove .DS_Stores
merging