Cleaned up pulse logic
Cleaned collision eligibility logic a bit