popcorn starter and bootstrap changes