Add attackTypes, fix various things