Add medium names, fix count bug