fixed bug with updating default state, fixed state names and state messages