Added missing functions.  Corrected other function names.