Various fixes, introduced new workspaces