Fixed up messages and case where files wouldn't get saved.