context support + minor bug fix