Added some more libraries and some formatting changes