logic cleanups, reactions working again