Added some new libraries, some fixes, some changes