Additional updates, including tests and re-comp of docs