Documentation updated; use of marginalia