Nicer behavior of hidden edges (and some label updates which I forgot to commit)