fixed workspace bugs