change workshop dir and other fixes