Thanks, updated.  More testing needed :)