Added bootstrap and a bug fix