fix up a few more functions.  typechecks now.