fixed a number of bugs in the resolution-zero