Reorganized docs. Minor code fix wrt opt refs