[WIP] Minor fixes
Cleanup / messing around with workspaces and scope