Well, I changed a lot - but it mostly works now