It looks plausible to me, but I haven't tested it yet. Did it work well? Is there anything in particular you want comments on? So about +0.8 for now; merge if you're feeling sure. -- Martin