Add more documentation
Fix readme conflicts