many many changes, more translation