A to X, other small changes