Various changes; adding more canned states