Allow intraspecies attacking (again), add attack penalty, cleanup