Incorrect billing

Other yallo issues: