Shelf labels and some other small changes, see the commit message