few minor changes mainly on Output