checks bill for source type rather than payload

other syntactic bug fixes