Changed/added plotting features