id typ corrected, new contexts: some work