more updates in line with 0.9 beta.