- fixed keys for different environments
- updated TODO