Fixes #427
Let's make this read a little better.
Closes #428
closes #430
closes #431
Closes #432
Editing this a little bit more!
Start of change log.