better translate and bugs fixed