Changes made by Michael Møller (spec@live.dk).