Further fixes/documentation.