More tweaks to the combo system, also fixed the AddEP script that was somehow completely nuked