changed some return messqges