Resolve most of XXX's in documentation