loads of warrior changes

loads of warrior changes