Bugfixes

+ Custom File Names
- Possible Bugs
/ Code Cleanup