Added more messages for different states closes #627