- Workspace improvements
- changes missing from previous commit