More library work and clarification