more updates for 0.9.20