Cleanup + added file save dialog and file filtration