Fix spacing
Fix saving/loading