There was humour, but only when it was necessary and appropriate and not in a way that undermines the general tone of the movie or certain scenes. I hope you are right about the casting of two villains.