Final conversion fixes; now runs