doc update and marg render fix