fix alphabetization, add autoform