We did some refactoring
We fixed a string related bug and wrote some debug code