First part of fixes is now finally DONE!

Woohoo.

Now I need to do some testing during next days, just to make sure things
are working the way they should. :)