Minor cleanup. Chart display and save can now both work at once