Make minor improvements

Feel free to take what you consider useful. 

The explanation for every change and/or the links that provide more in-depth information, can be found in the commit message.

--

Hope it helps. :)