Finishing Translation + fixes