reformat some stuff and add TAB command