Updating to fix a few bits