More changes towards a working version.