UPDATED some comments and print-messages