* Smaller Fixups
* Test and coverage update