Improved logging

- Handle non-root domains
- Updated specs, better error handling