Fixed general bugs (mostly around string consistenty