Cleaning up and adding libs