Updated libs and minor changes