Issue #126 File-system image cache
Make the billing address actually facultative
cleanup