Here's a patch of things I think may need to be adjusted. Maybe all orsome of the changes will prove useful.
Thanks,
Brian B.