Alot of fixes, alot of bugs :)
Workspace update