candycourier: make some things nicer