event fix
card fix
refactoring
fix arbo and add reachability
test refactoring