- fix for non-US locale
- fix for missed TODO environment variable