text changes, more context info & bug fixes