Various updates KANGed from BladeIII