Some changes to Context - make context() static, and rename it to curren...

...tContext() and some other small changes