Minor tweaks and first specs.