Fixed controller restart (I think). Minor changes to chief, perhaps unnecessary.