diff --git a/Makefile.Defines b/Makefile.Defines
index 07126f842..820ad6d7d 100644
--- a/Makefile.Defines
+++ b/Makefile.Defines
@@ -65,8 +65,8 @@ GPAR = -fopenmp -ftree-parallelize-loops=4
 GMEM = -fsanitize=undefined -fsanitize=address -fsanitize=leak 
 GWARNINGS = -Wall -Warray-bounds  -Wimplicit-interface -Wextra -Warray-temporaries
 
-FFLAGS  = $(IDEBUG) $(HEAPARR)
-#FFLAGS  = -init=snan,arrays -no-wrap-margin -O3 $(STRICTREAL) $(SIMDVEC) $(PAR) 
+#FFLAGS  = $(IDEBUG) $(HEAPARR)
+FFLAGS  = -init=snan,arrays -no-wrap-margin -O3 $(STRICTREAL) $(SIMDVEC) $(PAR) 
 FORTRAN = ifort
 #AR     = xiar
 
diff --git a/examples/symba_energy_momentum/collision_movie.py b/examples/symba_energy_momentum/collision_movie.py
index de39bc326..3fd3b6a86 100755
--- a/examples/symba_energy_momentum/collision_movie.py
+++ b/examples/symba_energy_momentum/collision_movie.py
@@ -11,16 +11,15 @@
 ymin = -20.0
 ymax = 20.0
 
-#cases = ['supercat_head', 'supercat_off', 'disruption_head', 'disruption_off']
-cases = ['disruption_off']
+cases = ['supercat_head', 'supercat_off', 'disruption_head', 'disruption_off']
 
-def scale_sim(ds, param):
+def scale_sim(ds):
 
-    dsscale = ds
+    dsscale = ds.where(ds.id > 0, drop=True) # Remove the central body
 
     GMtot = dsscale['GMass'].sum(skipna=True, dim="id").isel(time=0)
-    rscale = sum(ds['Radius'].sel(id=[2, 3], time=0)).item()
-    ds['Radius'] /= rscale
+    rscale = ds['Radius'].sel(id=1, time=0)
+    dsscale['Radius'] /= rscale
 
     dsscale['radmarker'] = dsscale['Radius'].fillna(0)
 
@@ -68,7 +67,7 @@ def __init__(self, ds, param):
 
         frame = 0
         nframes = ds['time'].size
-        self.ds = scale_sim(ds, param)
+        self.ds = scale_sim(ds)
         self.param = param
         self.rot_angle = {}
 
@@ -80,9 +79,20 @@ def __init__(self, ds, param):
 
         self.stream = self.data_stream(frame)
         # Setup the figure and axes...
-        self.fig, self.ax = plt.subplots(figsize=(8,8))
+        fig = plt.figure(figsize=(8,8), dpi=300)
+        plt.tight_layout(pad=0)
+        # set up the figure
+        self.ax = plt.Axes(fig, [0., 0., 1., 1.])
+        self.ax.set_xlim(xmin, xmax)
+        self.ax.set_ylim(ymin, ymax)
+        self.ax.set_axis_off()
+        self.ax.set_aspect(1)
+        self.ax.get_xaxis().set_visible(False)
+        self.ax.get_yaxis().set_visible(False)
+        fig.add_axes(self.ax)
+        
         # Then setup FuncAnimation.
-        self.ani = animation.FuncAnimation(self.fig, self.update, interval=1, frames=nframes,
+        self.ani = animation.FuncAnimation(fig, self.update, interval=1, frames=nframes,
                                           init_func=self.setup_plot, blit=False)
         self.ani.save(animfile, fps=60, dpi=300,
                       extra_args=['-vcodec', 'libx264'])
@@ -187,13 +197,6 @@ def setup_plot(self):
         t, name, GMass, Radius, npl, pl, radmarker, origin = next(self.data_stream(0))
 
         cval = self.origin_to_color(origin)
-        # set up the figure
-        self.ax = plt.axes(xlim=(xmin, xmax), ylim=(ymin, ymax))
-        plt.axis('off')
-        plt.tight_layout(pad=0)
-        self.ax.set_aspect(1)
-        self.ax.get_xaxis().set_visible(False)
-        self.ax.get_yaxis().set_visible(False)
 
         # Scale markers to the size of the system
         self.v_length = 0.50  # Length of arrow as fraction of velocity
@@ -219,7 +222,7 @@ def update(self,frame):
         """Update the scatter plot."""
         t, name, GMass, Radius, npl, pl, radmarker, origin = next(self.data_stream(frame))
         cval = self.origin_to_color(origin)
-        #varrowend, varrowtip = self.velocity_vectors(pl, radmarker)
+        varrowend, varrowtip = self.velocity_vectors(pl, radmarker)
         sarrowend, sarrowtip = self.spin_arrows(pl, name, radmarker)
         for i, p in enumerate(self.patches):
             p.set_center((pl[i, 0], pl[i,1]))
diff --git a/examples/symba_energy_momentum/disruption_headon.in b/examples/symba_energy_momentum/disruption_headon.in
index e1a5316bc..bc91bbdd0 100644
--- a/examples/symba_energy_momentum/disruption_headon.in
+++ b/examples/symba_energy_momentum/disruption_headon.in
@@ -1,11 +1,11 @@
 2
-2 1e-07 0.0009
+1 1e-07 0.0009
 7e-06
 1.0 -4.20E-05 0.0
 0.00 6.28 0.0
 0.4 0.4 0.4 !Ip 
 0.0 0.0 6.0e4 !rot
-3 7e-10 0.0004
+2 7e-10 0.0004
 3.25e-06
 1.0 4.20E-05 0.0
 0.00 -6.28 0.0
diff --git a/examples/symba_energy_momentum/disruption_off_axis.in b/examples/symba_energy_momentum/disruption_off_axis.in
index b6bc29c26..792bb3a4a 100644
--- a/examples/symba_energy_momentum/disruption_off_axis.in
+++ b/examples/symba_energy_momentum/disruption_off_axis.in
@@ -1,11 +1,11 @@
 2
-2 1e-07 0.0009
+1 1e-07 0.0009
 7e-06
 1.0 -4.20E-05 0.0
 0.00 6.28 0.0
 0.4 0.4 0.4 !Ip 
 0.0 0.0 6.0e4 !rot
-3 7e-10 0.0004
+2 7e-10 0.0004
 3.25e-06
 1.0 4.20E-05 0.0
 -0.80 -6.28 0.0
diff --git a/examples/symba_energy_momentum/escape.in b/examples/symba_energy_momentum/escape.in
index b8308af87..911cfce8e 100644
--- a/examples/symba_energy_momentum/escape.in
+++ b/examples/symba_energy_momentum/escape.in
@@ -1,11 +1,11 @@
 2
-2 1e-07 0.0009
+1 1e-07 0.0009
 7e-05
 99.9 0.0 0.0
 100.00 10.00 0.0
 0.4 0.4 0.4 !Ip 
 0.0 0.0 1000.0 !rot
-3 1e-08 0.0004
+2 1e-08 0.0004
 3.25e-05
 1.0 4.20E-05 0.0
 0.00 -6.28 0.0
diff --git a/examples/symba_energy_momentum/sun.in b/examples/symba_energy_momentum/sun.in
index 7117d93c3..2f3904e5d 100644
--- a/examples/symba_energy_momentum/sun.in
+++ b/examples/symba_energy_momentum/sun.in
@@ -1,11 +1,11 @@
 2
-2 2e-08 
+1 2e-08 
 3e-04
 5e-2 0.0 0.0
 0.00 10.00 0.0
 0.4 0.4 0.4 !Ip 
 100.0 100000.0 -2300.0 !rot
-3 2e-08 
+2 2e-08 
 3e-06
 1.0 0.00E-05 0.0
 0.00 6.28 0.0
diff --git a/examples/symba_energy_momentum/supercatastrophic_headon.in b/examples/symba_energy_momentum/supercatastrophic_headon.in
index 7b420c9a0..6894837f9 100644
--- a/examples/symba_energy_momentum/supercatastrophic_headon.in
+++ b/examples/symba_energy_momentum/supercatastrophic_headon.in
@@ -1,11 +1,11 @@
 2
-2 1e-07 0.0009
+1 1e-07 0.0009
 7e-06
 1.0 -4.20E-05 0.0
 0.00 6.28 0.0
 0.4 0.4 0.4 !Ip 
 0.0 0.0 -6.0e4 !rot
-3 1e-08 0.0004
+2 1e-08 0.0004
 3.25e-06
 1.0 4.20E-05 0.0
 0.00 -6.28 0.0
diff --git a/examples/symba_energy_momentum/supercatastrophic_off_axis.in b/examples/symba_energy_momentum/supercatastrophic_off_axis.in
index a464d037e..230ed071f 100644
--- a/examples/symba_energy_momentum/supercatastrophic_off_axis.in
+++ b/examples/symba_energy_momentum/supercatastrophic_off_axis.in
@@ -1,11 +1,11 @@
 2
-2 1e-07 0.0009
+1 1e-07 0.0009
 7e-06
 1.0 -4.20E-05 0.0
 0.00 6.28 0.0
 0.4 0.4 0.4 !Ip 
 0.0 0.0 -6.0e4 !rot
-3 1e-08 0.0004
+2 1e-08 0.0004
 3.25e-06
 1.0 4.20E-05 0.0
 1.00 -6.28 0.0