Looks good to me, minor comments only.