refactored events (not finished) and set up nameterm selector