various misc. left over bits, handle function names properly now that I know how.