Daniel's suggestions to texts

Based on feedback from awesome people :)
Merge pull request #6 from danielweinmann/master

Daniel's suggestions to texts