Various fixes and a simple combat system