semicolon, check for event handlers

a couple more additions,