Quick improvements on Context
Tree fixes and improvements
Context renaming and cleaning