fixing and integrating build system w/ common