variable cleanup, event bugfixes, one more update condition left