Adding libs and minor tweaks