Improvements on translation; thanks to @lin871106