Doc cleanup; fixing build