master: a-0 fixed some bugs