modified builder
Mode some changes.

Some slight modifications were done. We also changed how options
are handled in the loop.

[Branch: development]