master: a-0 fixed some bugs, should be ready to go