improved code coverage and spec narrative, bug fixes.