Fix typos, update states