Updated additional tweaks per peer review.