bumped model-builder; better messages / guards