Fixed some bugs in the context
Added fluency in context interface