(master) fixed some bugs