fixed billing bugs