Update Messages.java

improve the messages