Fixing a few mistakes