@rwhitley I've fixed the issues you pointed out, and made them part of this review.