Fixes bug issues described in issue #98 #99

Closed JeremiahKW closed 1 week ago