alphabetized and some minor cleanups.