Lots of changes!

Combo system and player properties and other exciting changes