added a bunch of junk.  This helpful commit message brought to you by sleep dep and apathy.
fixed merge