renaming to context terminology
added inherentProperties and a few bug fixes