Some plotting changes