Merge pull request #7 from Thelonedevil/combat

Combat and project fixing