Fixing a few small bugs and names