Added some libs and minor tweaks