Various small fixes, renaming etc.
Merge pull request #62 from TekHus/how-to-improvements

Various small fixes, renaming etc.