This took a while, but should please you

Also, some of this is merging issues. LINE SPACING IS RESTORED. And, finally, sorry this took a while but I couldn't get to the computer with Git bash until now. 

**And with this, peace is restored to the land of cadmus**
This is a remnant from a git merge conflict.