formatting and spec updates