allow custom aliases
clean up yaml