Some weapon improvements