Fix small typo
Improve handling of billing key, close #96