Misc updates as part of review

Enjoy!