CHANGES once more

Jetz another one big commit. :)