Small changes to walkopt