fix a few bugs; normalize naming; improve event browse a little