Fix command and improve dout
Comments