Fix a bug and add some more