selfbuild.sh update
Misc changes