split bootstrap.php and fixes