>i saw the Laurel Lane thing, but not Black Canary....

They just said her full name. And she showed some kung fu styles a week or so after. That's it.

As for Merlyn... it's just his best friend. No reveal other than just the name.