Minor enhancements

Add '/' suffix for dirnames
Preview matches execution order