Fixing typos.
Fixing flavor ID; Using State constants class.