Bugfixes, reverted to custom YAML output method