Some changes are made

...but no real progress, have a look at it and do something.