Added the build package to the setup

and some minor changes