Tweaks to the tutorial modeling code