updating bits to be consistant with recent changes

says the vague message.  Basically cleaning up after myself