Various changes to get this accursed system working ;)