Added bootstrap, and various minor fixes/alterations