Various fixes
Doubled the spacing in most areas to make the code easier to read
Merged readme updates with code updates