Fixed some issues, added a translation