Add caption and logScale switch