- bit prepareing
- Builder fixes