bootstrap changes
Merge pull request #3 from cordoval/minor-review

[WIP] minor fixes