Updated libs, cleanup