1.6.1, slight changes

most important is ER_CANCELLED_FAIL,
sounded strange as it was