- Improvements to globals setup
- Some improvements to package setup