Some YAML Tweaks and Extensions, mostly stuff to support special requirements