Add ability to save to desktop + Fixes
Tidy Up