yaml indentation
misc changes