better logging - fixed billing loop