Updates as per review + other minor changes to better format xlabels