Add multiple library's and fixed bugs