Fixed saving location
Fixxed some issues.