Fixed few small bugs
Updated libs