master: fixed a bug, and changed some weights