fixed a couple of minor issues
v2.0 - cancel/replace previous one