Corrections and spec cleanup