closes #1004 and working on translations