Various bug fixes relating to the order of numbers and symbols.