adding libs, cleaning