added some more labels everywhere