Worked on misc state stuff.