Change some program messages to be clearer
Merge