Code cleanups, event handling, bump versions.