Workspace fixes, fixes, and some ED