updates and spec fixes