Cleaning up and making all libs complete