some little stuff (rename sth and fix a bug of the commit before)