Master to 0.9

another merge from master that has the right parenting and other stuff too.