fix messages
improved output