Fix error reporting
Fix typos
Don't use database of services yet