Lot of bugfixes... :-)