Small, but important (esp. for non-US users) fixes...

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