work on contexts and documentation