Fixed translate and bugs