publib / private improvements