Code

improved library handling