good point(s). I'll update the code.