fix of workspace and build problems

still getting major.minor version error on startup
Merge branch 'testbranch'