fixing style of yaml and other updates