Changed a lot of function names and deleted some extraneous stuff.
Changed a lot of function names and deleted some extraneous stuff.