let-343: fixes for bootstrap conflicts
let-346: fixes for text
Merge pull request #8 from Velaport/let-343

Let 343