More Bpay fixes and cleaned up all of eesh's warning that ere shitting me up the wall