Bootstrap

Still getting the hang of this pull request stuff. Accidentally sent one on the master branch. Fixed the things you had brought up