fixed errors in function names, and forgotten options