Added license; made slight design corrections, invalidating it as part of the spec.