Fix stats if there's no services
Make the invoice stuff skippable
Whitespace cleanups