fixed bugs.  Didn't do what I set out to do...