Changes to mleibman since fork

Lets pull some of these in.