Some improvements; added demonstration Spec.