bootstrap and a few changes