bug fixed, minor changes of text output