fixed up edit message and issue population