Character and state declarations needs to be reorganized

[moirage]

When we added new states and characters to the scanner, we gave them integer values that started after the highest integer value. So they have high integer values, but are placed (for readabilities sake) around similar states who have a lower integer value. The bottom line is simply the states and character declarations are a bit messy and should be cleaned up (or possibly reimplemented as enums or in some more organized way). We did not have time to clean this system up.