Naming and bug fixes

- Cannot have two files with the same name
- Fixed another big bug