major improvements in $Element#context