More translations and cleanup