Tweaks and a spec.