Lotta additions to the combat system