Small changes to code and inputs