overhaul again the private lib stuff.. Now it REALLY works