add nobootstrap option + make generation work better