Fixed, adding some suggestions from the forums and then I'll send the commit.