ContextRework: BUG-FIXES