Made a few bug fixes, mostly the clone bug where I wasn't cloning my
hashmaps.