Fixes to bills code
Supporting cancel URLs