Added general store; improved library