Fixed node labels and restored iPad support