algo tweaks in preparations for refactoring the way events work