added more comments, slightly improved bootstrapper