Update docs; fix bugs
Merge