Improved help and error msgs in Context