Working copy so far, andreas will commit updated versions of a lot of stuff. :D