added ability to increment/decrement on abort, other bug fixes