bugfixes in pbs und rbs
more bugfices
Merge branch 'project' into design