Issue #40
#42
#21
#24
#22
#44
Minor modification of text contents.