Added bootstrap, and a few small changes