modify tab & small fix