- Update to ENV Paths
- Cleaned up aliases