formatting and spec fixes