Looks good; my original recommendations still apply.