Update stuff - fix Settings I think, and update AutoStateCommand