More polish on bootstrap script