fixing some forEach junk