Merged documentation with various updates I had lying around