Some refactoring:
- User credentials specified in YAML-file
- Various fixes