fixed file-naming conflicts
Integrated all modes except The Works