Feature/more bootstrap

yeah that's good to go for now. i added things that should have gone in master, but whatev.