Workspace changes.

Closes: gh-185, gh-189, gh-190, gh-191