ok, all better now. merge away (I think/hope)