fix up bootstrap; support both online and offline mode