Assorted updates

@nealstewart 
I don't understand the use of this object yet. I implore you to cease superficial changes to them until we have time to make tests.