New YAML settings + verified checking

Also, some small TODOs where fixed in the meantime.