Additional functions

And some alphabetization fixes.