bug fixes

fixed some bugs - added getters for context