Collide Update & Cleaning

*Cleaned script from merge trash
*Changed combo system to function with much less code