more updates before GA
m