add javadocs and update ContextCreator