updates and spec changes