Finally dug this out and played again after a few years. Will see how the 2nd editions rules fix things.
