Add coments and info output