MenuState update, and a bug fix. I think I'm done?
Git nonsense