cleanup and comments
updating translations