1. Fix NPE in case if context has already been created
2. incorrect bahaviour during dynamic context addressing fixed
3. continue development of battle