Ok, reworked the changes against your latest master.