make billing optional & fix status call