Cleanup and started adding different combat types (matrix, physical, astral)