Revamped collision system
fixed fps issue + doing some cd
merged