Fix some bugs
Use of StringBuilders