Many Minor Fixes
Still .DS-Store