build cleanup
Add --dry-run to build
Make options more palatable