Fixes, comments, etc from code review with Marv & Faiz