Fixed some squiffy formatting
First draft, general terms
Compiled versions