add to recent workspaces and some cleanup