fixed bugs, changed to english