Saving canvas to file + minor changes