include proposal in build system
incl. proposal in cmake build. fix several problems.