allow for CH alphanumeric account numbers, fix corner cases