diff --git a/HISTORY.rst b/HISTORY.rst
index 2fa365d..f919eef 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -66,10 +66,11 @@ Some fixes
 * More fixes to the opentopography grabber
 * This uses an api key in a file now
 
-0.4.8 (2022-12-06)
+0.4.9 (2022-12-13)
 ------------------
 
 Some fixes
 
 * Added the lsdtt-valley-metrics to the driver interface
 * Added point mapping to the plotting tools
+* A number of bug fixes to the command line interface
diff --git a/lsdviztools/lsdplottingtools/lsdmap_swathplotting.py b/lsdviztools/lsdplottingtools/lsdmap_swathplotting.py
index 56dc4da..eb7c62f 100644
--- a/lsdviztools/lsdplottingtools/lsdmap_swathplotting.py
+++ b/lsdviztools/lsdplottingtools/lsdmap_swathplotting.py
@@ -9,6 +9,7 @@
 
 import numpy as np
 import os
+import pandas as pd
 from . import cubehelix
 import matplotlib.pyplot as plt
 import matplotlib as mpl
@@ -60,12 +61,15 @@ def PlotSwath(swath_csv_name, FigFileName = 'Image.png', size_format = "geomorph
     ax = fig.add_subplot(gs[25:100,10:95])
 
     print("Getting data from the file: "+swath_csv_name)
-    thisPointData = LSDMap_PD.LSDMap_PointData(swath_csv_name)
+    df = pd.read_csv(swath_csv_name)
+
+    print("The headers are: ")
+    print(list(df))
     
-    distance = thisPointData.QueryData('Distance').values
-    mean_val = thisPointData.QueryData('Mean').values
-    min_val = thisPointData.QueryData('Min').values
-    max_val = thisPointData.QueryData('Max').values
+    distance = df["distance"].values
+    mean_val = df["median_z"].values
+    min_val = df["minimum_z"].values
+    max_val = df["max_z"].values
     
     # Get the minimum and maximum distances
     X_axis_min = 0
diff --git a/lsdviztools/scripts/lsdtt_plotbasicrasters.py b/lsdviztools/scripts/lsdtt_plotbasicrasters.py
index ebb7bfc..bb3ba7b 100644
--- a/lsdviztools/scripts/lsdtt_plotbasicrasters.py
+++ b/lsdviztools/scripts/lsdtt_plotbasicrasters.py
@@ -462,7 +462,7 @@ def main(args=None):
         
     # See if you should create a basemap
     if args.create_basemap_figure:
-        import LSDBasemapTools as LSDBM
+        from lsdviztools.lsdbasemaptools import lsdmap_basemaptools as LSDBM
         
         MakeBasemapDirectory(this_dir)
         RasterFile = args.fname_prefix+".bil"
diff --git a/setup.cfg b/setup.cfg
index 0235ec2..cc23e0f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.8
+current_version = 0.4.9
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index e8d9945..30ee83b 100644
--- a/setup.py
+++ b/setup.py
@@ -29,6 +29,8 @@
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
     ],
     description="lsdviztools is a collection of routines for plotting geospatial data, with a focus on data produces by LSDTopoTools or by lsdtopytools.",
     entry_points={