WIP of the day (translations and cleanup)