tidy ups and spec tweaks