* Upgrade libraries
* Minor bug fixes