minor changes and remove hflag