Improved saving and editing of project