Remove more commented cruft
update email
Organize language modes