Refactored Bootstrap
installer updates