tweaks in preperation for event system launch