Progress bug fixed and diagram save added