Removed manual creation of contexts. Contexts are now injected.
Merge and some fixes.