A bunch of bug fixes and added a toggle that only allows us states to be seen