merged mapping loading; various
new build