minor improvements

filter expired events, small wording changes