fixed logic bug
fixed yaml bug