Continuing words expansion

Library updates too