A few more updates for stuff to be in 1.0