Some cleanup and paths to save/load csv now fixed