Fix logo, fix flatMap