Some changes to library mostly.