further context help improvements