tool init now uses infra events.
general cleanup