Updating the docs & making everything prettier
Merge