bug fixing
more translation and fixes