Tweaks to specs after rebasing on top of #16