yes, this should help :)

looks sensible.  will merge, and will hollar if my problems aren't fixed.