Minor tweaks, fixed detail disclosure error for now
Resolved conflict with ds_store file