Added a Build_01 + tiny code changes

just small things