fix few bugs with interactiv mode.