change builder path and small fixes