Mostly everything works now