added Plotto and other small changes