more labels and tweaks