added bootstrap and did some cleanup