Fixing a lot of stuff.  Removing virtuals, cleaning up code, changing map iterators, added while loop, etc