Updated with latest README and spec.