Fixed W harass toggle and improved combo logic