English translation and some fixes
English translation and some fixes