Interactive mode, some fix
10 files changed