Minor conversion changes from CF
Fixing bugs
.DS_Store files (should be ignored)