added warhammer, bruising, code cleanup