Added libraries
Minor changes