changed the menu (hopefully now better to understand)
fixed some small errors in update-state