Changes from Olle Schuett included, input for scaling of exchange correction included.