Update library
Maake changes to reflect library changes. Update comments