A few changes to highlight the points the parameter stuff touches